minor remake (sigleton/tables stuff rollback)