Cleaned up Basic section