trouble shooting done in master with nadrew