Better but still does not work properly