additional logging
logging and switched logic