Re-added subtitle code and trying to stay as close as possible to the original