Added more features, will break code