Got it working but need to do it again