fixed pipeline and stuff