changed to new style and reduced the size of apk