aftter bugs fixed