Prepared version for next development iteration