Removed the comments for because they are not working properly
GA version