got rid of the hacks in sharrre