Modify style, needs to improve