Moved initiation to top
changed handler to basic