Commiting this version, and will scrap in next commit