added better organization