refactoring light again, must find better co-ords