Import ekarak's changes