new features have been included

review demos 1 & 4 are working properly