Commented out some code for the time being (weird bug......)