Minor changes, doesn't seem to work...