raoulbhatia: Custom changes