added better functionality?