The last commit did'nt work properly. Maybe this wanna be.