Added basic punc in/out logic