[UPDATE] Changes according to client