merged some backend files