Fixed the WHITTEEEE GAPS