Lot of changes made by jeje