Merged with samy and everything working