Shaved alot of code off