Some modifications for own system