Added simpler design