Configured guard
Updated TODO