Removed some uselss stuff and replaced it