Added requested changes for alpha build