Added features. Tweak design