First working version
Small update for transmitter/receiver