Merge changes

Did some changes and everything seems to be working fine. Will be pushing to master on main repo.