All modification, wrapping moved to window onload