Wrapped code better