Changes based on using lusty and autoclose