Changed the whole design, inspired by Stew.