Improve ball catching
ballcatching update
merge