Razor (stage II)

optimized development and design