Cleaned up/working build(1.5.1)