Modified for debug