Updates and now rendering properly