commed out remove na stuff -- not working gaah