in next version i make this compact :D