Updates to get shit working