Fixed the basics