Modified for debugging

TODO: remove