Add speed and efficily