initial version as per development on local machine