Debug, update with more options