Changing sql commands too :)