changed charlie to cypher
change s to scanner
merging master with before_applebeta