fixed newly added stuff