Some changes for better adaptation