Updated for OMAP only