working on fixing current/later