This should be ready for galaxy now