working version
style fixed