simplified passing block; pillow => mattress
updated TODO