re-worked for testing bugs