Some modifications to prototype