Some changes in utils and user control