changed to simple way