Working on pre wrapping issues