Adding rest of the code