Added shortcut functions
Stripped huge amount of unused old codes