Converted to new reuseable style