Removed half complete stuff