simplifying backend, bringing it closer to stock