My changes to make functional;