ShoreDroid changes