Updated working on code