using dcg's where possible

looks nicer