Bug-Fixes/ImplemetedPlaque