Preparation for hACE

Mehran! hACE are coming soon. This are just easing hACE are using.