Simplified code... a lot