more fixed. more to be fixed