New BorderWait collab using AndroidStudio