synched aod with master; implemented style