updated for final build