Updated edit, better now?