Made it more OCD friendly..