Final changes, everything working perfect