Some more changes and updated apk file