removed debug and stuff'