Merge Dan's changes
Work single styling