passed some tests finally...