Citation 15 Final

Citation 15 with Final Fixes & working properly