Updated to use the wrapper style