Changed the basics