creating new fork of dgal
resolved conflicts from initial fork