Updates to overall code