Working - removed debug()s