GUI added + Contract modified