Re-organised logic