updated for more testing