Removed debug stuff added CE control