Updates to make sizes work