slight modification on style