friendly added and some test fixed