Removed/merged some functionality