Updates for better elegance