Added troy's stuff