added changes from gurofaller