some getters and setters
merge