style and logic updates
style and logic updates