need to debug
working for now