fixed so classes work together