removed more code similar to the previous commit