Removed debug and rejig