Some changes to fit my needs