added developer switch (for testing purposes)