Updated with variables