Some changes, sorry for terrible message