update to match warmup1 requirements (no unit tests)