Removed ugly syntax for charlie