Now Im fixing stuff for next weeks demo