adding tylers code
fixing merge