Changed image structure and added better blocks