17.1 ret_time as method + some removing of unnecessary stuff