Feature/improved design