Added perret318 changes