Think its working now, testing on dept