updated main
completed app