Simplified version of the next commit using '@'