[intermediate] fixed stuff