Combined 2 defs into 1