Design added and variable changes