cleaned up capture