fixed an issue and added convenience methods