General update and added logic