Quick modification for testing