Latest changes. TODO: switch from vash, brings more troubles than goods