improved repair rake task