Final Commit I guess. Everything seems to be working smooth & correctly now