better code now :)