Better Profile. Some changes