Updates to fix big bug