Removed clone requirement, change layout for debug