Removed some tweaks. Some errors occured. #2