Added most recent IDE changes