shabai's changes
more changes