[CHANGE] easier, working solution;