Some changes for better experience