added avilablity -> result
moved enums