added all required for version 1, ready to deploy