Updated to satisfy review comments