Playing with layout on package.. not sure its an improvement