need to look over stall logic