added better stuff